Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Change add_on translation to added_on and include placeholder for the date #24562

Merged
merged 7 commits into from
May 6, 2023

Conversation

yardenshoham
Copy link
Member

The correct thing to do is to translate the entire phrase into a single string. The previous translation assumed all languages have a space between the "added on" and the date (and that "added on" comes before the date).

Some languages, like Hebrew, have no space between the "added on" and the date. For example:

added_on=נוסף ב-%s

("added" becomes נוסף, "on" is ב and when paired with a date we use a dash to connect ב with the date)

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@GiteaBot GiteaBot added the lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. label May 6, 2023
@pull-request-size pull-request-size bot added the size/S Denotes a PR that changes 10-29 lines, ignoring generated files. label May 6, 2023
@GiteaBot GiteaBot added lgtm/need 1 This PR needs approval from one additional maintainer to be merged. and removed lgtm/need 2 This PR needs two approvals by maintainers to be considered for merging. labels May 6, 2023
@lunny lunny added this to the 1.20.0 milestone May 6, 2023
templates/shared/secrets/add_list.tmpl Outdated Show resolved Hide resolved
@GiteaBot GiteaBot added lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. and removed lgtm/need 1 This PR needs approval from one additional maintainer to be merged. labels May 6, 2023
Co-authored-by: delvh <dev.lh@web.de>
@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 6, 2023
lunny pushed a commit that referenced this pull request May 6, 2023
…aceholder for the date (#24563)

- Similar to #24550
- Similar to #24562 

The correct thing to do is to translate the entire phrase into a single
string. The previous translation assumed all languages have a space
between the "valid until" and the date (and that "valid until" comes
before the date).

Signed-off-by: Yarden Shoham <git@yardenshoham.com>
@GiteaBot
Copy link
Collaborator

GiteaBot commented May 6, 2023

@yardenshoham please fix the merge conflicts. 🍵

@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 6, 2023
@yardenshoham
Copy link
Member Author

I did, thanks bot

@yardenshoham yardenshoham added the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 6, 2023
@lunny lunny merged commit 4667955 into go-gitea:main May 6, 2023
@GiteaBot GiteaBot removed the reviewed/wait-merge This pull request is part of the merge queue. It will be merged soon. label May 6, 2023
@yardenshoham yardenshoham deleted the added-on branch May 6, 2023 13:12
zjjhot added a commit to zjjhot/gitea that referenced this pull request May 8, 2023
* upstream/main:
  Fix broken link in tests/e2e/README (go-gitea#24576)
  [skip ci] Updated licenses and gitignores
  Add goto issue id function (go-gitea#24479)
  Improve decryption failure message (go-gitea#24573)
  Simplify template helper functions (go-gitea#24570)
  Makefile: Use portable !, not GNUish -not, with find(1). (go-gitea#24565)
  Add org visibility label to non-organization's dashboard (go-gitea#24558)
  Sort users and orgs on explore by recency by default (go-gitea#24279)
  Change `add_on` translation to `added_on` and include placeholder for the date (go-gitea#24562)
  Change `valid_until` translation to `valid_until_date` and include placeholder for the date (go-gitea#24563)
  Fix docs failing the build on `main` (go-gitea#24561)
  Improve wiki user title test (go-gitea#24559)
  Fix incorrect user visibility (go-gitea#24557)
  Change `join_on` translation to `joined_on` and include placeholder for the date (go-gitea#24550)
  Require at least one unit to be enabled (go-gitea#24189)
  Fix broken `README` link (go-gitea#24546)
  Check latest version on CI (go-gitea#24556)
silverwind pushed a commit that referenced this pull request May 19, 2023
@go-gitea go-gitea locked as resolved and limited conversation to collaborators Aug 4, 2023
Sign up for free to subscribe to this conversation on GitHub. Already have an account? Sign in.
Labels
lgtm/done This PR has enough approvals to get merged. There are no important open reservations anymore. modifies/translation size/S Denotes a PR that changes 10-29 lines, ignoring generated files.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants